debian/control: Use system libmarisa

diff --git a/debian/changelog b/debian/changelog
index aeab62de4611b5bc6c8a21adb4a28f6f8da5dd80..8e0e6050f50553c933fc394e0698f45a3ddc3bbc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opencc (1.1.1-1) unstable; urgency=medium
+opencc (1.1.1-1~exp1) experimental; urgency=medium
 
   [ 肖盛文 ]
   * New upstream version 1.1.1
@@ -24,7 +24,12 @@ opencc (1.1.1-1) unstable; urgency=medium
   * delete unused patch: use-system-libraries.patch
   * d/watch: use @PACKAGE@ @ANY_VERSION@@ARCHIVE_EXT@
 
- -- Boyuan Yang <byang@debian.org>  Sat, 23 May 2020 10:41:31 -0400
+  [ Boyuan Yang ]
+  * ds: Do not include bundled gtest and libmarisa.
+  * debian/rules: Explicitly disable building bundled libmarisa.
+  * debian/control: Add new build-dependency libmarisa-dev.
+
+ -- Boyuan Yang <byang@debian.org>  Sat, 23 May 2020 10:45:53 -0400
 
 opencc (1.1.1-1~exp1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index ed2533b85c2b049b322c644e67874e9aded52944..1bee22ef204a60d10ef9de2dfd8b23602b6e4b90 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
  doxygen,
  graphviz,
  libjs-jquery,
+ libmarisa-dev,
  libtclap-dev,
  python3:any,
  rapidjson-dev,

diff --git a/debian/rules b/debian/rules
index 80549609bb8594b3d19759971b9d7ce960d138e6..50e26c1c2ff1e10f3f9dc94a21934045015a53a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,8 @@ override_dh_auto_configure:
                -DCMAKE_INSTALL_PREFIX=/usr \
                -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ \
                -DCMAKE_BUILD_TYPE=Release \
-               -DBUILD_DOCUMENTATION=ON
+               -DBUILD_DOCUMENTATION=ON \
+               -DBUILD_BUNDLED_LIBMARISA=OFF
 
 execute_after_dh_auto_install:
        ln -sf /usr/share/javascript/jquery/jquery.js debian/tmp/usr/share/opencc/doc/html/jquery.js